tegra: Move clock_early_init() to arch_cpu_init()

The clock init is not board specific, so move it into
the cpu code.

Signed-off-by: Simon Glass <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra: Move cpu_init_cp15() to arch_cpu_init()

This call is more of an architecture requirement than a board
one, so move it there.

Signed-off-by: Simon Glass <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master

Seaboard changes have removed the need for common/board.o in the
Makefile. Propagate this change to the other Tegra2 builds.

Signed-off-by: Tom Warren <[email protected]>

tegra: Fix build error in plutux, medcom

We need to define CONFIG_ENV_IS_NOWHERE to avoid this error:

cmd_nvedit.c:69:3: error: #error Define one of CONFIG_ENV_IS_IN_...

Signed-off-by: Simon Glass <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Add Avionic Design Medcom support.

The Medcom is a 16:9 15" terminal that is used for patient infotainment
in hospitals.

Changes in v3:
  * Remove unused implementation of gpio_config_uart().
  * Implement MMC/SD card detection.
  * Drop board_mmc_getcd() which is now implemented by common Tegra2
    code.
  * Add MAINTAINERS entry.

Changes in v2:
  * No longer override the default CONFIG_SYS_TEXT_BASE setting.

Signed-off-by: Thierry Reding <[email protected]>
Acked-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Add Avionic Design Plutux support.

The Plutux is a set-top box device based on the Tamonten processor
module. It can be connected to a display via an HDMI output.

Changes in v3:
  * Remove unused implementation of gpio_config_uart().
  * Implement MMC/SD card detection.
  * Drop board_mmc_getcd() which is now implemented by common Tegra2
    code.
  * Add MAINTAINERS entry.

Changes in v2:
  * No longer override the default CONFIG_SYS_TEXT_BASE setting.

Signed-off-by: Thierry Reding <[email protected]>
Acked-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Add common Avionic Design Tamonten support.

Tamonten is an NVIDIA Tegra2-based SO-DIMM processor module that is
derived from the Harmony reference design.

Changes in v3:
  * Remove unused gpio_config_uart().
  * Remove call to tegra2_start().
  * Use new tegra2_mmc_init().

Signed-off-by: Thierry Reding <[email protected]>
Acked-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Move tegra2_mmc_init() prototype to public header.

tegra2_mmc_init() is implemented by the Tegra2 MMC driver. Since most of
the Tegra2-based boards will need to call it, this commit exports it in
the new public asm/arch/mmc.h header file to prevent each board from
providing its own prototype.

Signed-off-by: Thierry Reding <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Tested-by: Stephen Warren <[email protected]>
Acked-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000.

NVIDIA's flashing tools assume that the bootloader is loaded at address
0x00108000. Instead of requiring non-standard builds of those tools
which allow a load address of 0x00E08000, this commit just switches all
Tegra2 boards to use the standard load address.

Signed-off-by: Thierry Reding <[email protected]>
Tested-by: Simon Glass <[email protected]>
Acked-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Always build with USE_PRIVATE_LIBGCC=yes.

The AVP on Tegra2 doesn't boot properly when U-Boot is linked against
the GCC provided libgcc. To work around this, always build and link
against a private libgcc for Tegra2-based boards.

Signed-off-by: Thierry Reding <[email protected]>
Tested-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Plumb in SPI/UART switch code

On Seaboard the UART and SPI interfere with each other. This causes the UART
to receive spurious zero bytes after SPI transactions and also means that
SPI can corrupt a few output characters when it starts up if they are still
in the UART buffer.

This updates the board to use the SPI/UART switch to avoid the problem.

For now this feature is turned off since it needs changes to the NS16550
UART to operate.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: spi: Support SPI / UART switch

Add the SPI / UART switch logic into the Tegra2 SPI driver so that it
can co-exist with the NS16550 UART.

We need the ns16550.h header for NS16550_t for now.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Implement SPI / UART GPIO switch

The Tegra2 Seaboard has the unfortunate feature that SPI and the console
UART are multiplexed on the same pins. We need to switch between one
and the other during SPI and console activity.

This new file implements a switch and keeps track of which peripheral
owns the pins. It also flips over the controlling GPIO as needed

Since we are adding a second file to board/nvidia/common, we create
a proper Makefile there and remove the direct board.o include from
board/nvidia/seaboard/Makefile

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Enable SPI environment on Seaboard

This uses the SPI flash on Seaboard to store an 8KB environment.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: config: Enable SPI flash on Seaboard

The Seaboard includes a Winbond 4MB flash part.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: spi: Add SPI driver for Tegra2 SOC

This driver supports SPI on Tegra2, running at 48MHz.

Signed-off-by: Tom Warren <[email protected]>
Acked-by: Mike Frysinger <[email protected]>

tegra2: Add UARTB support

UARTB is used on some boards, so support it here.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

tegra2: Tidy UART selection

UART selection is done with a lot of #ifdefs. This cleans things up
a little.

Signed-off-by: Simon Glass <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

arm, davinci: Fix build warnings for cam_enc_4xx

This patch fixes a build warning for the cam_enc_4xx board introduced by
commit d6ec0c0dfc70447cf615ae80a952da81f73f16b4:

spl.c:35:13: warning: 'gdata' defined but not used
spl.c:36:13: warning: 'bdata' defined but not used

Signed-off-by: Christian Riesch <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Heiko Schocher <[email protected]>

Devkit8000: Switch over to enable_gpmc_cs_config

Use enable_gpmc_cs_config instead of local writing
timing configuration for GPMC.

Signed-off-by: Thomas Weber <[email protected]>

arm, davinci: Add support for generating AIS images to the Makefile

Signed-off-by: Christian Riesch <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Mike Frysinger <[email protected]>

mkimage: Fix variable length header support

Support for variable length images like AIS image was introduced
in commit f0662105b674a3874227316abf8536bebc9b5995. A parameter
"-s" was also introduced to prohibit copying of the image file
automatically in the main program. However, this parameter
was implemented incorrectly and the image file was copied
nevertheless.

Signed-off-by: Christian Riesch <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Heiko Schocher <[email protected]>
Acked-by: Stefano Babic <[email protected]>

arm, da850evm: Add an SPL for SPI boot

Signed-off-by: Christian Riesch <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Sandeep Paulraj <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Sudhakar Rajashekhara <[email protected]>

arm, davinci: Add SPL support for DA850 SoCs

This code adds an SPL for booting from SPI flash on DA850 SoCs.

Signed-off-by: Christian Riesch <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Sandeep Paulraj <[email protected]>
Cc: Tom Rini <[email protected]>
Acked-by: Tom Rini <[email protected]>

sf: Add spi_boot() to allow booting from SPI flash in an SPL

Signed-off-by: Christian Riesch <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Scott Wood <[email protected]>
Acked-by: Mike Frysinger <[email protected]>

spl: display_options.o is required for SPI flash support in SPL

Signed-off-by: Christian Riesch <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Mike Frysinger <[email protected]>

ARM: omap3: add support to Technexion twister board

The twister board is a development board using
the TAM3517 SOM.

Support for NAND, 2 Ethernet (EMAC and SMC911),
USB (EHCI_OMAP).

Signed-off-by: Stefano Babic <[email protected]>
CC: Tapani Utrianen <[email protected]>
CC: Tom Rini <[email protected]>
CC: Sandeep Paulraj <[email protected]>

ARM: omap3: added common configuration for Technexion TAM3517

The TAM3517 is a SOM module that can be used on custom boards.
The patch add a common configuration file that is included
by the boards using this module.

Signed-off-by: Stefano Babic <[email protected]>
CC: Tapani Utrianen <[email protected]>
CC: Tom Rini <[email protected]>
CC: Sandeep Paulraj <[email protected]>

vision2: Fix checkpatch warning

Fix the following checkpatch warning:

WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Fabio Estevam <[email protected]>

Merge branch 'next' of ../next

* 'next' of ../next:
  mkenvimage: Add version info switch (-V)
  mkenvimage: Fix getopt() error handling
  mkenvimage: Fix some typos
  phy: add Micrel KS8721BL phy definition
  net: introduce per device index
  mvgbe: remove setting of ethaddr within the driver
  x86: Add support for specifying an initrd with the zboot command
  x86: Refactor the zboot innards so they can be reused with a vboot image
  x86: Add infrastructure to extract an e820 table from the coreboot tables
  x86: Add support for booting Linux using the 32 bit boot protocol
  x86: Clean up the x86 zimage code in preparation to extend it
  x86: Import code from coreboot's libpayload to parse the coreboot table
  x86: Initial commit for running as a coreboot payload
  CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c
  CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c
  CHECKPATCH: ./board/esd/hh405/fpgadata.c
  CHECKPATCH: ./board/esd/pci405/fpgadata.c
  CHECKPATCH: ./board/esd/tasreg/fpgadata.c
  CHECKPATCH: ./board/esd/apc405/fpgadata.c
  CHECKPATCH: ./board/esd/voh405/fpgadata.c
  CHECKPATCH: ./board/esd/ash405/fpgadata.c
  CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c
  CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c
  CHECKPATCH: ./board/esd/ar405/fpgadata.c
  CHECKPATCH: ./board/esd/plu405/fpgadata.c
  CHECKPATCH: ./board/esd/wuh405/fpgadata.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c
  CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c
  CHECKPATCH: ./board/esd/canbt/fpgadata.c
  CHECKPATCH: ./board/esd/du405/fpgadata.c
  CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c
  CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c
  avr32:mmu.c: fix printf() length modifier
  fat.c: fix printf() length modifier
  cmd_sf.c: fix printf() length modifier
  Make printf and vprintf safe from buffer overruns
  vsprintf: Move function documentation into header file
  Add safe vsnprintf and snprintf library functions
  Move vsprintf functions into their own header

Conflicts:
tools/mkenvimage.c

Signed-off-by: Wolfgang Denk <[email protected]>

Prepare v2011.12

Signed-off-by: Wolfgang Denk <[email protected]>

doc/mkimage.1: Fix -D/-f options formatting

Signed-off-by: Horst Kronstorfer <[email protected]>

post/lib_powerpc/multi.c: fix stack overflow error

The code and comment disagreed: the comment claimed that r6...r31
were copied, and consequently the arrays for "src" and "dst" were
declared with 26 entries, but the actual code ("lmw r5,0(r3)" and
"stmw r5,0(r4)") copied _27_ words (r5 through r31), which resulted
in false "POST cpu Error at multi test" messages.

Fix the comment and the array sizes.

Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Kim Phillips <[email protected]>
Cc: Andy Fleming <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>
Tested-by: Anatolij Gustschin <[email protected]>

post/lib_powerpc/multi.c: code cleanup

Clean up and document the code:

- get rid of unneeded code block
- add comment which code is generated

Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Kim Phillips <[email protected]>
Cc: Andy Fleming <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

post/lib_powerpc/multi.c: make checkpatch clean

Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Kim Phillips <[email protected]>
Cc: Andy Fleming <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

PPC: fix "Warning: FOO uses hard float, BAR uses soft float".

It appears that with recent versions of GCC the explicit
"-mhard-float" command line option takes precedence over the
``asm(".gnu_attribute 4, 2");'' in the source file, so this no longer
helps to avoid the warnings we get when linking code that uses FP
instructions with other code that was built using soft-float.

We can remove the ".gnu_attribute" (which appears to carry no other
information, at least so far) from the object files, but we also have
to make sure we don't pull in the __gcc_qsub() and __gcc_qmul()
functions from the standard libgcc, as these would again "infect" our
linking.  We copy this code from:
gcc-4.2.2/gcc/config/rs6000/darwin-ldouble.c
This old version was chosen because it was still available under a
compatible license (GCC v2+).   The file was stripped down to the
needed parts, and reformatted so it passes checkpatch with only one
warning (do not add new typedefs).

Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Andy Fleming <[email protected]>
Cc: Kim Phillips <[email protected]>
Tested-by: Stefan Roese <[email protected]>
Tested-by: Anatolij Gustschin <[email protected]>

Print program basename instead of whole path in usage()

Signed-off-by: Horst Kronstorfer <[email protected]>

tegra2: Fix out-of-tree build for Ventana.

Since Ventana is derived from Seaboard and requires seaboard.c to build,
make sure board/nvidia/seaboard is created in the build tree.

Signed-off-by: Thierry Reding <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Tested-by: Stephen Warren <[email protected]>
Tested-by: Wolfgang Denk <[email protected]>

Prepare v2011.12-rc3

Signed-off-by: Wolfgang Denk <[email protected]>

arm: Tegra: fix undefined instruction hang immediately after reset

commit 0d479b53 (Aneesh V) added code for OMAP4 that doesn't
execute on Tegra, due to the AVP (ARM7TDI) not having a CP15.
Result was an undefined instruction hang just after reset.

Signed-off-by: Tom Warren <[email protected]>
Cc: Albert Aribaud <[email protected]>
Cc: Tom Rini <[email protected]>
Acked-by: Aneesh V <[email protected]>

doc/mkimage.1: Fix some typos

Signed-off-by: Horst Kronstorfer <[email protected]>
Acked-by: Mike Frysinger <[email protected]>

mkenvimage: Add version info switch (-V)

Signed-off-by: Horst Kronstorfer <[email protected]>

mkenvimage: Fix getopt() error handling

Since the original implementation indicates explicit error handling
we turn off getopt()'s internal error messaging to avoid duplicate
error messages.  Additionally we add ':' (missing option argument)
error handling.

Signed-off-by: Horst Kronstorfer <[email protected]>

mkenvimage: Fix some typos

Signed-off-by: Horst Kronstorfer <[email protected]>

phy: add Micrel KS8721BL phy definition

This adds support for the Micrel KS8721BL/SL PHY.

The definition is taken from the correspondent datasheet.

Signed-off-by: Vladimir Zapolskiy <[email protected]>

km/common: add toolchain variable

Add a variable "toolchain" and configure the rootpath
for the nfsargs with this variable.

Signed-off-by: Holger Brunck <[email protected]>
cc: Wolfgang Denk <[email protected]>

Makefile: fix distclean and *_config rules to be less noise

Signed-off-by: Lauri Hintsala <[email protected]>

board/eltec/elppc/misc.c: Fix GCC 4.6 build warning

Fix:
misc.c: In function 'misc_init_r':
misc.c:119:3: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <[email protected]>

drivers/net/e1000.c: Fix GCC 4.6 build warnings

Fix:
e1000.c: In function 'e1000_read_mac_addr':
e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

e1000.c:1149:2: warning: dereferencing type-punned pointer
will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Kyle Moffett <[email protected]>
Acked-by: Kyle Moffett <[email protected]>

board/esd/cpci750/mv_eth.c: Fix GCC 4.6 build warnings

Fix:
mv_eth.c: In function 'mv64360_eth_real_open':
mv_eth.c:425:6: warning: variable 'port_status' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_stop':
mv_eth.c:643:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_xmit':
mv_eth.c:719:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_receive':
mv_eth.c:804:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_get_stats':
mv_eth.c:903:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_update_stat':
mv_eth.c:931:24: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c:930:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_print_stat':
mv_eth.c:1012:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'eth_clear_mib_counters':
mv_eth.c:2069:15: warning: variable 'dummy' set but not used [-Wunused-but-set-variable

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Reinhard Arlt <[email protected]>

usb: s3c_udc_otg: fix GCC 4.6 build warnings

Fix:
In file included from s3c_udc_otg.c:216:0:
s3c_udc_otg_xfer_dma.c: In function 'complete_tx':
s3c_udc_otg_xfer_dma.c:280:33: warning: variable 'is_short' set but not used
s3c_udc_otg_xfer_dma.c:280:6: warning: variable 'ep_tsr' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_irq':
s3c_udc_otg_xfer_dma.c:469:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c:468:18: warning: variable 'gintmsk' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_queue':
s3c_udc_otg_xfer_dma.c:582:14: warning: variable 'gintsts' set but not used
s3c_udc_otg_xfer_dma.c:581:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_read':
s3c_udc_otg_xfer_dma.c:778:6: warning: variable 'ret' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_udc_set_halt':
s3c_udc_otg_xfer_dma.c:1020:16: warning: variable 'flags' set but not used
s3c_udc_otg_xfer_dma.c: In function 's3c_ep0_setup':
s3c_udc_otg_xfer_dma.c:1258:13: warning: initialization from incompatible
pointer type [enabled by default]
s3c_udc_otg_xfer_dma.c:1239:16: warning: variable 'is_in' set but not used
s3c_udc_otg_xfer_dma.c:1239:9: warning: variable 'bytes' set but not used
s3c_udc_otg.c: In function 'usb_gadget_register_driver':
s3c_udc_otg.c:292:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 'usb_gadget_unregister_driver':
s3c_udc_otg.c:338:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_enable':
s3c_udc_otg.c:582:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_ep_disable':
s3c_udc_otg.c:646:16: warning: variable 'flags' set but not used
s3c_udc_otg.c: In function 's3c_dequeue':
s3c_udc_otg.c:704:16: warning: variable 'flags' set but not used

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Remy Bohmer <[email protected]>

board/samsung/universal_c210/universal.c: Fix build warning

Fix:
universal.c: In function 's5pc210_phy_control':
universal.c:273:7: warning: 'ret' may be used uninitialized
in this function [-Wuninitialized]

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Minkyu Kang <[email protected]>
Acked-by: Minkyu Kang <[email protected]>

FAT: fix some issues in FAT write support code

Writing a file to the FAT partition didn't work while a
test using a CF card. The test was done on mpc5200 based
board (powerpc). There is a number of problems in FAT
write code:

Compiler warning:
fat_write.c: In function 'file_fat_write':
fat_write.c:326: warning: 'counter' may be used uninitialized
in this function
fat_write.c:326: note: 'counter' was declared here

'l_filename' string is not terminated, so a file name
with garbage at the end is used as a file name as shown
by debug code.

Return value of set_contents() is not checked properly
so actually a file won't be written at all (as checked
using 'fatls' after a write attempt with 'fatwrite'
command).

do_fat_write() doesn't return the number of written bytes
if no error happened. However the return value of this
function is used to show the number of written bytes
in do_fat_fswrite().

The patch adds some debug code and fixes above mentioned
problems and also fixes a typo in error output.

NOTE: after a successful write to the FAT partition (under
U-Boot) the partition was checked under Linux using fsck.
The partition needed fixing FATs:
-bash-3.2# fsck -a /dev/sda1
fsck 1.39 (29-May-2006)
dosfsck 2.11, 12 Mar 2005, FAT32, LFN
FATs differ but appear to be intact. Using first FAT.
Performing changes.

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Donggeun Kim <[email protected]>
Cc: Aaron Williams <[email protected]>
Acked-by: Donggeun Kim <[email protected]>

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

Merge branch '[email protected]' of git://git.denx.de/u-boot-staging

* '[email protected]' of git://git.denx.de/u-boot-staging:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function

drivers/net/e1000_spi.c: Fix build warnings

Fix:
e1000_spi.c: In function 'spi_free_slave':
e1000_spi.c:115: warning: unused variable 'hw'
e1000_spi.c: In function 'do_e1000_spi':
e1000_spi.c:472: warning: 'checksum' may be used uninitialized in this function
e1000_spi.c:472: note: 'checksum' was declared here

Signed-off-by: Anatolij Gustschin <[email protected]>
Cc: Kyle Moffett <[email protected]>
Acked-by: Kyle Moffett <[email protected]>

net: Fix arguments in tftpput command

The switch to strict_strtoul() was not done correctly - this fixes
the compile error when CONFIG_CMD_TFTPPUT is active.

There appears to very little use of strict_strtoul() in commands, so
it might be easier to switch to simple_strtoul(). If not, we should
decide the best way to use strict_strtoul(). For now I have added a
friendly message which will of course increase code size.

Signed-off-by: Simon Glass <[email protected]>

AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <[email protected]>
Acked-by: Andreas Bießmann <[email protected]>
Signed-off-by: Anatolij Gustschin <[email protected]>

net: introduce per device index

Instead of counting the device index everytime a functions needs it, store
it in the eth_device struct. eth_register() keeps track of the indices and
updates the device's index number. This simplifies some functions in
net/eth.c.

Additionally, a network driver can now query its index, eg. to get the
correct environment ethaddr name.

Signed-off-by: Michael Walle <[email protected]>
Cc: Prafulla Wadaskar <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Wolfgang Denk <[email protected]>
Acked-by: Mike Frysinger <[email protected]>

mvgbe: remove setting of ethaddr within the driver

A network driver should not touch the environment at all. This patch fixes
this behaviour by removing the code for setting a default/randomized MAC
address.

Signed-off-by: Michael Walle <[email protected]>
Acked-by: Mike Frysinger <[email protected]>
Acked-by: Prafulla Wadaskar <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Prafulla Wadaskar <[email protected]>
Cc: Valentin Longchamp <[email protected]>
Cc: Eric Cooper <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Siddarth Gore <[email protected]>
Cc: Albert ARIBAUD <[email protected]>
Cc: Simon Guinot <[email protected]>
Acked-by: Prafulla Wadaskar <[email protected]>

common/cmd_pxe.c: Fix GCC 4.6 build warnings

Fix:
cmd_pxe.c: In function 'parse_pxefile_top':
cmd_pxe.c:941:5: warning: 'err' may be used uninitialized in this
  function [-Wuninitialized]
cmd_pxe.c:921:6: note: 'err' was declared here

Signed-off-by: Heiko Schocher <[email protected]>
Cc: Jason Hobbs <[email protected]>
Acked-by: Jason Hobbs <[email protected]>

AVR32: fix timer_init() function

timer_init() now returns an int (the error code) instead of void.
This makes compilation fail with:

interrupts.c:111: error: conflicting types for 'timer_init'
/home/svens/u-boot/u-boot/include/common.h:246: error: previous
declaration of 'timer_init' was here
make[1]: *** [interrupts.o] Error 1

Signed-off-by: Sven Schnelle <[email protected]>
Acked-by: Andreas Bießmann <[email protected]>
Signed-off-by: Anatolij Gustschin <[email protected]>

PXA: Kill last remnants of set_GPIO_mode function

GPIO configuration shall never be done inside a driver, never.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Albert ARIBAUD <[email protected]>

ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
from mach-types.h. Add them to the board config file.

Signed-off-by: Anatolij Gustschin <[email protected]>
Acked-by: Simon Glass <[email protected]>

ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by: Anatolij Gustschin <[email protected]>
Acked-by: Simon Glass <[email protected]>

arm, fdt: update ethernet mac address before booting Linux

Signed-off-by: Heiko Schocher <[email protected]>
Cc: Albert ARIBAUD <[email protected]>
Cc: Gerald van Baren <[email protected]>
Acked-by: Wolfgang Denk <[email protected]>

add print_cpuinfo to s3c24x0

Hello

This patch adds support for "print_cpuinfo" on Samsung s3c24x0
based targets. If activated by "#define CONFIG_DISPLAY_CPUINFO", the
chip ID and the 3 main cpu frequencies will be displayed.

Dave

Signed-off-by: David Müller <[email protected]>

omap4_panda: Initialize the USB phy

During misc_init_r, make sure to setup the clocks
properly for the USB hub on the pandaboard.  With
this in place, the USB hub and the ethernet works
on the pandaboard.

Signed-off-by: Chris Lalancette <[email protected]>
Acked-by: Aneesh V <[email protected]>

davinci: Fixed wrong timebase clock frequency.

Signed-off-by: Manfred Rudigier <[email protected]>

arm926ejs: remove noop flush_dcache_all function

Commit 2f3427c added noop cache functions implementation for arm926ejs
to fix compilation of drivers depending on these functions (DaVinci
EMAC in particular).

Unfortunately, the bug was introduced: noop implementation calls
dcache_disable which calls flush_dcache_all which in turn calls
dcache_disable thus creating an infinite loop.

This patch removes noop implementation for flush_dcache_all, we already
have default one in arch/arm/lib/cache.c and it should be used instead.

Signed-off-by: Ilya Yanok <[email protected]>
Tested-by: Matthias Weisser <[email protected]>

M28: Fix tab indent in u-boot.bd

Signed-off-by: Marek Vasut <[email protected]>
Cc: Wolfgang Denk <[email protected]>
Cc: Detlev Zundel <[email protected]>
Cc: Stefano Babic <[email protected]>

Fix building for mx51evk board

Fix:
mx51evk.c:206:6: error: conflicting types for 'board_ehci_hcd_init'
/u-boot/include/usb/ehci-fsl.h:254:5: note: previous declaration of
'board_ehci_hcd_init' was here

We also fix board_ehci_hcd_init() for mx53loco board.
Building for mx53loco worked since <usb/ehci-fsl.h> is
not included here.

Signed-off-by: Anatolij Gustschin <[email protected]>

Prepare v2011.12-rc2

Signed-off-by: Wolfgang Denk <[email protected]>

Coding Style cleanup

Fix trailing white space, indentation by spaces instead of TABs,
excessive blank lines, trailing blank lines.

Signed-off-by: Wolfgang Denk <[email protected]>

drivers/usb/gadget/pxa27x_udc.c: Coding Style cleanup

Commit bdbcdc89 "pxa: convert pxa27x_udc to use read and write
functions" added a number of C++ comments.  Fix these.

Signed-off-by: Wolfgang Denk <[email protected]>

common/cmd_nvedit.c: Fix size calculation in do_env_import()

do_env_import() missed the final '\0' terminator when calculating the
size of an environment data block.  This led to an erroneous 'bad CRC,
import failed' message for a checksum protected environment (-c.)

Signed-off-by: Horst Kronstorfer <[email protected]>

x86: Add support for specifying an initrd with the zboot command

This change finishes plumbing the initrd support built into the zboot
mechanism out to the command interface.

It also fixes a bug in the command declaration where the kernel size could
be passed as an optional second parameter but not enough arguments were
allowed.

Signed-off-by: Gabe Black <[email protected]>

x86: Refactor the zboot innards so they can be reused with a vboot image

If vboot successfully verifies a kernel, it will leave it in place and
basically ready to boot. The zeropage table which is part of the x86 boot
protocol is at the end of the kernel, though, instead of the beginning, and
because the image is already in place there's no need to copy it around.
This change refactors the code which implements the zboot command so that
the configuration of the zeropage table and loading the pieces of the
kernel into memory are done separately. Also, because the command line goes
before the zeropage table in vboot which is somewhat incompatible with the
normal protocol, where to put the command line is a now a parameter instead
of being hard coded.

Signed-off-by: Gabe Black <[email protected]>

x86: Add infrastructure to extract an e820 table from the coreboot tables

Also approximate the size of RAM using the largest RAM address available
in the tables. There may be areas which are marked as reserved which are
actually at the end of RAM.

Signed-off-by: Gabe Black <[email protected]>

x86: Add support for booting Linux using the 32 bit boot protocol

This change conditionally modifies the zboot command so that it can use the
32 bit boot protocol. This is necessary because the 16 bit realmode entry
point assumes that it can call BIOS services which neither coreboot nor
u-boot provide.

Signed-off-by: Gabe Black <[email protected]>

x86: Clean up the x86 zimage code in preparation to extend it

This change cleans up some formatting issues in the zimage handling code, and
converts it from using offsets added to a base pointer to using the available
structure definitions which were already being included.

Signed-off-by: Gabe Black <[email protected]>

x86: Import code from coreboot's libpayload to parse the coreboot table

This change also forces the lib_sysinfo structure to be in the .data
section. Otherwise it ends up in the .bss section. U-boot assumes that it
doesn't need to copy it over during relocation, and instead fills that
whole section with zeroes. If we really were booting from ROM that would be
appropriate, but we need some information from the coreboot tables (memory
size) before then and have to fill that structure before relocation. We
skirt u-boot's assumption by putting this in .data where it assumes there
is still read only but non-zero data.

Signed-off-by: Gabe Black <[email protected]>

x86: Initial commit for running as a coreboot payload

Add a target for running u-boot as a coreboot payload in boards.cfg, a
board, CPU and a config. This is a skeleton implementation which always
reports the size of memory as 64 MB.

Signed-off-by: Gabe Black <[email protected]>

CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Stefan Roese <[email protected]>

CHECKPATCH: ./board/esd/hh405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/pci405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/tasreg/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/apc405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/voh405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/ash405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/ar405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>

CHECKPATCH: ./board/esd/plu405/fpgadata.c

Signed-off-by: Marek Vasut <[email protected]>
Cc: Anatolij Gustschin <[email protected]>
Cc: Stefano Babic <[email protected]>
Acked-by: Anatolij Gustschin <[email protected]>